Updated Norwegian Nynorsk translation. Removed leftover conflict

2004-01-27  Åsmund Skjæveland  <aasmunds@fys.uio.no>

	* nn.po: Updated Norwegian Nynorsk translation.
	* ChangeLog: Removed leftover conflict indicator.

diff --git a/po/ChangeLog b/po/ChangeLog
index 6b9fa3da530601b11f9c5f5dda9f207e3aa6c7be..6ad77f09d9bc982e48726b5247ada78f33291bdd 100644 (file)
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,7 +1,8 @@
 2004-01-27  Åsmund Skjæveland  <aasmunds@fys.uio.no>
 
        * nn.po: Updated Norwegian Nynorsk translation.
-
+       * ChangeLog: Removed leftover conflict indicator.
+       
 2004-01-26  Nikos Charonitakis  <frolix68@yahoo.gr>
 
        * el.po: Updated Greek translation.
@@ -68,7 +69,6 @@
        * ru.po: Updated Russian translation
        from Russian team <gnome-cyr@gnome.org>.
 
->>>>>>> 1.599
 2004-01-21  Artur Flinta  <aflinta@cvs.gnome.org>
 
        * pl.po: Updated Polish translation by GNOME PL Team.